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

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



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