Merge "Fix fingerprint on lockscreen preivew" into udc-dev am: d6a5b130 am: 4126195a

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



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