Merge "Revert "audio policy: bind setMode() and setPhoneState() operations"" into mnc-dev