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

* commit '8610f49c1a14c91550c8abde27bda59ac6526b23':
  audio policy: fix lockup during mediaserver restart