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

Merge changes from topic "trim_fonts_on_unlock" into udc-dev am: ef3d80a8 am: c58731a7 am: 5bd575e2 am: 04b4c908

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



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