am 1b4dc0fe: Merge "Volume control in MediaRouter dialogs" into jb-dev

* commit '1b4dc0fe00805f82fb4bb89a97b6b0501e117505':
  Volume control in MediaRouter dialogs