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

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

Change-Id: I18f42d46f01599dd17749f5ca0f09c24db694576