Merge "Merge "Add ability to set supported audio routes on phone accounts and connection" into cw-f-dev am: fd1f724e7a am: e9e77f2603" into nyc-mr2-dev-plus-aosp
am: da0b45e8e5

Change-Id: Idc325f66f9c2251bbdbe5260853d25c157c8d610