The hotfix worked. Android Security Update is still June 5, 2022.
I was on crD 8.6 of 30th June, with the latest MindTheGapps and Magisk Delta and 'not encrypted'. After copying needed stuff, I wiped cache and dalvik-cache and flashed today's AICP and DFE. On rebooting, everything is fine.