Merge "Limit maximum allowed size for a status bar icon" into oc-mr1-dev am:...

Merge "Limit maximum allowed size for a status bar icon" into oc-mr1-dev am: 7e6da177 am: a9aaed5d am: cdbee965

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

Change-Id: I73060a71106ff46f6489f471a004e500a58eed0f