am 4ce0cad1: Merge "Issue 3371080: fix volume update in mute state." into honeycomb

* commit '4ce0cad1b31016970f65bae0151dccb2234ee202':
  Issue 3371080: fix volume update in mute state.