Merge "Limit maximum allowed size for a status bar icon" into qt-dev am: 81a7a760c8 am: 6540ebaf5c am: 2bb50aba75

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

Change-Id: I76493811a68e7d78d57eb32134ed34e6c31a10d5