Merge "Size restrict right icon size in notification" into tm-dev am:...

Merge "Size restrict right icon size in notification" into tm-dev am: 9ec047d9 am: 65ad362a am: d1d863a9

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



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