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

Change-Id: I9bfe58895aadcd5c40bae1bfc7a093feee4a6aa2