Merge changes Id38bcf7c,I54f156d9 into lmp-dev

* changes:
  Update MediaController comment to mention notification listeners
  Don't play a sound when adjusting volume while telephony is active