Merge "Add lock icon click handler when a11y is enabled" into tm-dev am: e70333a5 am: e4c90856

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



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