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