am 213472d7: am 8c816096: Merge "Add support for audio focus locking" into lmp-mr1-dev

* commit '213472d7384c9d8096748f3cd9305ef49342dbcf':
  Add support for audio focus locking