Merge "Make icon sizes consistent" into rvc-dev am: 44d6bc8594 am: c523ddb24a am: 89e9727f26

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

Change-Id: I52aa4ac54da4200383b3e640e984650d34df75d2