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

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

Change-Id: Iaab7c9150e6d4309ca76421cf7bd7cf758d63b54