Merge "Fix SecurityException when need permissions for...

Merge "Fix SecurityException when need permissions for AccessibilityServicesTest" into udc-dev am: d4e30692

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



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