Merge changes from topic "trim_fonts_on_unlock" into udc-dev am: ef3d80a859 am: c58731a7f0 am: 5bd575e2c7 am: 04b4c908fa

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

Change-Id: I65ffe27cf2f0ceabf386f25a40ad29258632f06c
Signed-off-by: Automerger Merge Worker <[email protected]>