Merge "Make getContentProtectionPolicy api UserHandleAware" into main