am 2a56275e: Merge "Respect Android conventions in AudioManager extras" into lmp-dev

* commit '2a56275e4f09d0bd7e2b50d694686ff3f15357a2':
  Respect Android conventions in AudioManager extras