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

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

Change-Id: Ie39193babaff73ce39b5d6452868696631ae3a56