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

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

Change-Id: Id4126a7050d7e8a0bf86b27a61bcec8b7184466a