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

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



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