Merge "Limit maximum allowed size for a status bar icon" into rvc-dev am: 542be62b

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I880a041ea7754dc6d9ec12c262b1d4fdea45657d