Merge "Don't use dp for lock icon padding" into tm-qpr-dev am: 90023480

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



Change-Id: I34c20b8ce9bc56aeeb236c44c28f5fb922145bd4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>