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

am skip reason: subject contains skip directive

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

Change-Id: I6b725e45f5f013c5bcfdf4145b66aced34dccd62