Merge "Add ability to set supported audio routes on phone accounts and connection"
am: d11261dcc9

Change-Id: I002d1d32e6c0fb69c99047a19ca07f4326ec5323