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