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

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

Change-Id: Idc65f530624076d416b163a031d320731dca036c