Merge "Remove manual pregrants for AttentionService (handled via roles)" into tm-dev am: 0f9f5f93

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



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