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: I04a4486229a61c14a49d950a766ef690a7359214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>