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 am: 71f344b3 am: 45d5be12 am: c3b709e5

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

Change-Id: I8bff3ccc228fb00dcf9fe37777d7f42d79cb6eff