am 5bee844f: Merge "audio policy: fix lockup during mediaserver restart" into lmp-dev

* commit '5bee844fd8c2f6d9fa78ed5e063a8e3df9f2f7b6':
  audio policy: fix lockup during mediaserver restart