Merge "Merge "Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e7a" into nyc-mr1-dev-plus-aosp am: 325e93dfa3" into nyc-mr2-dev-plus-aosp
am: afd2e89fc4

Change-Id: Ie8dca67612016e4583bad7b84cf784fa5ab49cb7