Merge "Merge "Limit maximum allowed size for a status bar icon" into...

Merge "Merge "Limit maximum allowed size for a status bar icon" into rvc-qpr-dev am: 0ef492ff am: 299eda83" into sc-dev am: 4152e1c9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I2b856d1e0cd4f3b1ad492f636ff4da5066abd0f4