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