Merge changes from topic "trim_fonts_on_unlock" into udc-dev am: ef3d80a8...

Merge changes from topic "trim_fonts_on_unlock" into udc-dev am: ef3d80a8 am: 6e5d86ef am: cf7c795c

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



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