Merge "setWiredDeviceConnectionState requires MODIFY_AUDIO_ROUTING" into rvc-dev am: 5523d8ee am: a0e52f5c am: 90b98c8b Change-Id: I885071abe761a003a526cf42fe973064231bca41