Merge "Revert "policy_hal: Function prototype correction for custom policy"."