[automerger skipped] Merge "Prevent lock icon a11y when unlocking." into...

[automerger skipped] Merge "Prevent lock icon a11y when unlocking." into udc-dev am: b3b3c283 am: cf7c93e2 -s ours am: f1f94bcd -s ours am: 03d7b5a2 -s ours

am skip reason: Merged-In I8ae54095c55a5ca0816878f27b368c3a9abd73e3 with SHA-1 6a02b08b is already in history

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



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