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

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



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