Merge "Make icon sizes consistent" into rvc-dev am: 44d6bc85 am: c523ddb2 am: 890035d8

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

Change-Id: I4c7f53c4c73d0d22ededd7545d5bbb39d85844b2