am c80f4078: Merge "Fix locking for mMasterVolume and mMute"

* commit 'c80f4078291877450e60400dd29a004c61b875d5':
  Fix locking for mMasterVolume and mMute