Merge "Update icon in lock consent dialog" into udc-qpr-dev am: 74cfbf67

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



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