Merge "Update spacing for lock icon with udfps" into sc-dev am: 315a2678 am: 4d9277bb

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

Change-Id: I73c683349ac004d40468bd1f6fbaf2c6e33fd986