am e5326d96: Merge "DO NOT MERGE - audio policy: fix commit dea1541f" into lmp-dev

* commit 'e5326d965afc8941f85c866ae8dcdc8884c9709c':
  DO NOT MERGE - audio policy: fix commit dea1541f