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

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

Change-Id: I8fb27d045a7941f142dbe9b3a2dae9aa992b51a2