Merge "Revert "policy_hal: Initial change for the new libaudiopolicymanager""