Merge "Don't allow an external service to be an A11y service" into tm-dev am:...

Merge "Don't allow an external service to be an A11y service" into tm-dev am: 9172a68c am: 005aae38

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



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