Merge "setWiredDeviceConnectionState requires MODIFY_AUDIO_ROUTING" into rvc-dev am: 5523d8ee am: ad5b5b54 Change-Id: I67cbe0a8069ad0b50737646b401d638276ada33c