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

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

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

Change-Id: I3c1fb0dbb51e9220f8619d364f9821bc6ee63b01