Merge "Limit maximum allowed size for a status bar icon" into rvc-dev am:...

Merge "Limit maximum allowed size for a status bar icon" into rvc-dev am: 542be62b am: 35e7a140 am: d60e0108 am: f1f2c5f3

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

Change-Id: I7fd3377504ce16ad9adb39fa058880b324a3a0e5