am c36b8acd: am 38895394: Merge "Properly switch MediaRouter to wired audio over a2dp." into jb-dev

* commit 'c36b8acd1e850619de0bbf678b9573d4d761d836':
  Properly switch MediaRouter to wired audio over a2dp.