Merge "Increase maximum allowed size for status bar icons" into pi-dev am:...

Merge "Increase maximum allowed size for status bar icons" into pi-dev am: d17b9798 am: e2198860 am: b0d6e6cd am: b32d4d53

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

Change-Id: I9799b5e33dfdd2fb90e66a4bc3fbc9eac11a4557