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

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

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