Merge "Increase maximum allowed size for status bar icons" into pi-dev am: d17b979843 am: e219886035 am: b0d6e6cd57 am: b32d4d538b am: 1c8a052b5a

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

Change-Id: Idad086d6d5ca92ae308254dbced55e1869ab8746