Merge "Update lock icon and udfps padding" into sc-dev am: 2486a5f188

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

Change-Id: I78c297d04db2cd2397182bbc053ffd320a703207