Merge "Make icon sizes consistent" into rvc-dev am: 44d6bc85 am: d263f1a9...

Merge "Make icon sizes consistent" into rvc-dev am: 44d6bc85 am: d263f1a9 am: e9cdd38e am: d6e037c2

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12028265

Change-Id: Iba1785280ce64e548de6070f57ea17f5afe796f6