Merge "AudioDeviceBroker: avoid acquiring mDeviceStateLock when not necessary" into main