Merge "policy-hal: fix glitch in playback while applying setForceUse"