Merge "Revert "Audio: Do not sanitize android.hardware.audio@2.0-service""