[automerger skipped] Merge "Limit maximum allowed size for a status bar icon"...

[automerger skipped] Merge "Limit maximum allowed size for a status bar icon" into pi-dev am: ed7118d8 am: 04043de4 am: c7731486 -s ours am: bc6f5f8b am: f0aac434 am: 1eb3fe71 am: 9c177090

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

Change-Id: I5b728c6879604160f8f80ce8d2c2063d01e82159