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

Change-Id: I59ecf91d4178dc55b7cbab9ec3f93524f8bcfe62