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 am: 325e93dfa3
am: 599697dcfd

Change-Id: Ief97b2f234b20d2dbbaff1d4f745ef40d5b81180