am b20cdd3b: am 4a0e40a7: am f17f04a5: Merge "Volume: Avoid making bad forceVolumeControlStream call." into lmp-mr1-dev

* commit 'b20cdd3b6be3cb76fd1bf74af111a3140362f125':
  Volume: Avoid making bad forceVolumeControlStream call.