Merge "Limit maximum allowed size for a status bar icon" into qt-dev am: 81a7a760 am: 6540ebaf

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

Change-Id: Ia05cbabaa0151a2e064820032368de8fc2f88f37