Merge "Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e7a" into nyc-mr1-dev-plus-aosp