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

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



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