Merge "Limit maximum allowed size for a status bar icon" into rvc-qpr-dev am: 0ef492ff12 am: 299eda8338

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1e91e01da6e569ff3b6607a406cfe6abf1c081c8