Merge "policy-hal: make sure policy-hal is in sync with AOSP" into audio-userspace.lnx.2.2-dev