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

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



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