Merge "[DO NOT MERGE] Only show lock icon background with UDFPS" into sc-v2-dev am: d77cf96ca6

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

Change-Id: Ia555c70a7ab757f3cf1c3c3293e42edfb02d6236