Merge "vold: remove unused code for CONFIG_HW_DISK_ENCRYPTION" am: 4e6e7e6c70 am: c9548b9d9e

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

Change-Id: I65c09190aa8f6e61bda750980bfdcc06e0306d4b