Merge "Add ability to set supported audio routes on phone accounts and connection"