AudioPolicyService: Support MR1 audio_policy

Change-Id: I26abd352f327256856021b311efb1e23b46b6023

Conflicts:
	services/audioflinger/AudioPolicyService.cpp