Merge "Revert "Revert "AudioAttributes: add SPEAKER_CLEANUP to system u..."" into main