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

Merge "Merge changes from topic "trim_fonts_on_unlock" into udc-dev am: ef3d80a8 am: 6e5d86ef am: cf7c795c" into udc-qpr-dev-plus-aosp am: 73fd7ca4

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



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