Merge "Update lock icon and udfps padding" into sc-dev am: 2486a5f1 am: 759273e3 am: 6dee4c63

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

Change-Id: I04455bf87859b34496fcd2dd43e478524c2265cc