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