Merge "Fix locking for mMasterVolume and mMute"
tree: 508b29b6a0195b6f975ffdc0bc14defc09c9b8ec
  1. camera/
  2. cmds/
  3. drm/
  4. include/
  5. media/
  6. services/