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: I2c2bf638291124441133ba6e2f43b5b27035d558
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>