Merge "Revert "AudioService: simplify/document locking""