Merge "[SP21] Address comments for API council review about aosp/1172143"
tree: fc853f956fa150577ddfca8feab2b325cf73151e
  1. core/
  2. services/
  3. tests/