Merge "Update lock icon and udfps padding" into sc-dev am: 2486a5f1 am: fe1e9e09 am: 8ace666d

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

Change-Id: Ief64448646cbf5f059452f8c891d51ed5abd3a63