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