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 am: 1436a307

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



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