Merge "Add ability to set supported audio routes on phone accounts and...
Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e am: 5599fb37
am: 40b42d79
Change-Id: Ia3e6745a1c0c58f53df3421c725681de4fab29e6