Merge "Limit maximum allowed size for a status bar icon" into rvc-dev am: 542be62b05 am: 24ba3966b4 am: 1141cebaf0

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I523db5b63031dcb999cc238a774e27ed1cef01d3