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: f2cf01bb am: 8513f6b2

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



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