Merge "policy_hal: Update policy hal with latest AOSP refresh."