Merge "Limit maximum allowed size for a status bar icon" into oc-mr1-dev am: 7e6da1776d am: a9aaed5d47 am: cdbee965a7 am: 71f344b36a am: 45d5be1254 am: c3b709e513

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

Change-Id: I8bff3ccc228fb00dcf9fe37777d7f42d79cb6eff