Merge "Audio: Do not sanitize android.hardware.audio@2.0-service" am: f06fb17cd7
am: 52be9f0549

Change-Id: I4dc58b5336fb79d2844fa875fd1c805a418af7a0