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

* commit 'ddb78caa65cfff51433e6fda2230376bb681e611':
  audio policy: fix lockup during mediaserver restart