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

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

Change-Id: I8e76d41d7afd0a92808e5e5a62013ea15dddcb0f