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

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

Change-Id: I004fada7c059222db0ee732ebb947b74a85939e5