am cf77c94d: am 92c2439c: am 4be289e8: Merge "Route volume commands whenever media stream is in use" into lmp-dev

* commit 'cf77c94d2ac90306182fd05c242074c2bf559928':
  Route volume commands whenever media stream is in use