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

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

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



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