Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e7a am: e9e77f2603
am: 29059b46e6

Change-Id: I0883125e3f79eb1869b7dd4f47ac69a671dc676a