Merge "Limit maximum allowed size for a status bar icon" into oc-mr1-dev am: 7e6da1776d am: a9aaed5d47

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibdfd3049b4b2ddc7c44461decd25d466bfa3184c