Merge "Remove manual pregrants for AttentionService (handled via roles)" into...

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

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



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