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

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



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