[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: 05c69b21 -s ours am: 9bd6eeec -s ours

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

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



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