Merge "Increase maximum allowed size for status bar icons" into rvc-dev am: 4fdf4a5cee am: 38bdfc79e3 am: 2da87275fd

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

Change-Id: Ia13d6815391db1040ae46c3c9410be20bafe0c3c