Merge "Merge "Remove manual pregrants for AttentionService (handled via...

Merge "Merge "Remove manual pregrants for AttentionService (handled via roles)" into tm-dev am: 0f9f5f93 am: 86c58531" into tm-d1-dev-plus-aosp am: c3fd47cb

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



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