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 am: f01346ff

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



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