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

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



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