Merge "audio policy: remove obsolete AudioPolicyManager class members"