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

* commit '81cbf02115e03634ae68feabed6a7a7059b2e9a5':
  Respect Android conventions in AudioManager extras