Merge "Merge "Add ability to set supported audio routes on phone accounts and...
Merge "Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e" into nyc-mr1-dev-plus-aosp
am: 325e93df
Change-Id: I4111cc7e11a410a3160f2cab5fe16cbd26a91db9