Merge "Fix A11y features blocked by IT admin can be bypassed using a11y...

Merge "Fix A11y features blocked by IT admin can be bypassed using a11y shortcuts" into udc-dev am: 46be0221

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



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