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 am: d1990faa

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



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