Merge "Merge "Merge "Add ability to set supported audio routes on phone...

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