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

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

Change-Id: I196ca0fb1f23749ae5206d35069f6d02a8fa39e7