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

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

Change-Id: Iba77fef5b0996fae944f87223f4efa80b9eb6f24