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

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

Change-Id: I106b990bc09e29266af8086c2e9375dd8086a9ce