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

Merge "Revert "Introduce ro.crypto.uses_fs_ioc_add_encryption_key property"" into main am: 50e681b4 am: 59e73885

Original change: https://android-review.googlesource.com/c/platform/system/vold/+/2705760



Change-Id: I922242eeb193b924e8f242f954d1935f9cafd749
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>