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

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

Change-Id: Icc9bb79468fff25b2dd1e31cb25f2b017b8999df