Merge "AudioService: address code review comments" into main