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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I601494506cc44aaf38950d4c4139aed38f59fdbd