Merge "Update lock icon a11y click handler on a11y change" into tm-dev am: f6cfe35b am: c12be66b

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

Change-Id: I29d7654a212bd26451441a3b137e73a3ad3e5269