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

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



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