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

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

Change-Id: I8705e6ca94a50b2f8ca698e1d9c9711fcf1cf7cc