Merge "Limit maximum allowed size for a status bar icon" into pi-dev am: ed7118d8 am: 04043de4

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

Change-Id: I5d7be58c98debc681c655d8cda5745a449b91e58