Merge "Revert "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property"" into main