Merge "[automerger skipped] Update lock icon padding which is also used for UDFPS am: 25112bdb4b
am: b612bd8851
-s ours" into udc-qpr-dev-plus-aosp
This commit is contained in:
commit
cba5b0741e