Merge "Fix SecurityException when need permissions for...

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

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



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