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

Merge "Fix fingerprint on lockscreen preivew" into udc-dev am: d6a5b130 am: 56a261aa am: 58997ae5 am: fd552328

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



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