[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 am: 77a36511 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I0d26a344ddacce95d7f61c4ef522c63f6706c82a