Merge "Add ability to set supported audio routes on phone accounts and connection" am: d11261dcc9
am: 32e98d2f45

Change-Id: I0741edc2b35b7c57cbde338c4617791d1d089137