Merge "vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION" am: 4e6e7e6c70 am: c9548b9d9e am: 48b6b1c767 am: 1bb7e2a438

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

Change-Id: I492bb5a2e9727164db1e856d0c12677517039ea1