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

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



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