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

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

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

Change-Id: I706fa5e8e8783bc1f1260184552c5a2d90321836