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