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

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



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