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: 13da76ab am: b880a9c6

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

Change-Id: Ib8195d928a0981748124c4c6011f550954274479