Merge "Increase maximum allowed size for status bar icons" into pi-dev am: d17b9798

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

Change-Id: I0b56d3dfab3fb2f5b4e0968a9894439b503f059a