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

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

Change-Id: I39459ede70ce6764402fe3e0e5e909a7cbbd94b5