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

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

Change-Id: Iebb0c42e1a6d30e2ba273646af7d6b599d650095