Merge changes from topic "am-b7ddef85ce3944ac857d4fadd6aed0ce" into main

* changes:
  [automerger skipped] Merge "Don't prevent group volume adjustment in SysUI" into 24D1-dev am: 1a48ffee7d -s ours
  [automerger skipped] Don't prevent group volume adjustment in SysUI am: d18934b506 -s ours