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

Change-Id: I673d1ea6063ae546215e8904e0c41f3760473f49