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: dd0c111b am: 468d1217

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



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