Merge "Add ability to set supported audio routes on phone accounts and connection am: 4e22d6dc am: 9161228e" into nyc-mr2-dev-plus-aosp