Merge changes from topic "am-304552f3baf047f9832e90130a35899e" into sc-v2-dev-plus-aosp
* changes:
Merge "[DO NOT MERGE] Only show lock icon background with UDFPS" into sc-v2-dev am: d77cf96c
[DO NOT MERGE] Only show lock icon background with UDFPS am: 0f6491dc