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

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