[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: c5a0da45 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I1bb9988de055e92d94c6612f6a2673dba07a965f