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

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



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