am 4c68c685: (-s ours) Merge "DO NOT MERGE - audio policy: enable use of new AudioPolicyManager" into lmp-preview-dev

* commit '4c68c68532f47330903be70dba9371f3e842516c':
  DO NOT MERGE - audio policy: enable use of new AudioPolicyManager