Merge "Size restrict right icon size in notification" into tm-qpr-dev am: 9efc9fa3

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



Change-Id: I05ab942f289437951653e49ae779a46dfa541f36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>