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: I9de8b1f4d4ebed20583964200062edc2add0b28c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>