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

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



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