[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-v2-dev am: d77cf96c am: d14cb2e6 -s ours

am skip reason: subject contains skip directive

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

Change-Id: I531cec6e64df48d4a138c522852c1069ad987fcd