Merge changes from topic "Notificaiton Large font size UI clippings" into udc-dev am: d4533f1f am: b6ae5443

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



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