Merge "Increase maximum allowed size for status bar icons" into rvc-dev am: 4fdf4a5c

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

Change-Id: I74944f0f56979ed1a1029df066fa1de5663fde87