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

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

Change-Id: Ic9893834a86817f4e6f04af245fc97a09dadb1eb