Merge "policy_hal: Update custom policy manager to new base class"