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

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

Change-Id: Id14c82b6e133b09f253199e29b2bc572cd53758f