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