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

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