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

Change-Id: I68a116d6c16c67dbd74034e210d51d5de22dc999