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 am: 579643b7

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



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