Merge "Udfps icon, udfps bouncer, and lockicon/button bug fixes" into sc-dev...

Merge "Udfps icon, udfps bouncer, and lockicon/button bug fixes" into sc-dev am: ac15f928 am: 33be3fa7 am: 2ac60aff

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

Change-Id: I59284bba8ef891607f5a517aa8c125b1036ef2b2