Merge "Increase maximum allowed size for status bar icons" into rvc-qpr-dev am: b9f3c713 am: 11a53731

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

Change-Id: I3c58c37118aca2bfd9355c0a1fa9fba6d28cacbc