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

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

Change-Id: I6697adac6a2947e24368cafce0410f131936ea73