[automerger skipped] Merge "[DO NOT MERGE] Only show lock icon background with...

[automerger skipped] Merge "[DO NOT MERGE] Only show lock icon background with UDFPS" into sc-qpr1-dev am: edda362c -s ours am: 03342609 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I6a926a7a26c8c1d353185befdf87a8e8c67bae31