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

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



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