Merge "Prevent lock icon a11y when unlocking." into udc-dev am: b3b3c283 am: cf7c93e2

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



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