[automerger skipped] Merge "Limit maximum allowed size for a status bar icon" into pi-dev am: ed7118d8bf am: 04043de40c am: c7731486df -s ours am: bc6f5f8bf8

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

Change-Id: Id950e2e59e9522d1ecd0b756da1c4899c830cfec