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

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



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