Merge "Remove progress property support from encrypt_inplace()" am: 8bf0d914df

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

Change-Id: I15768cb52cf0c160f06a1532688cb31bac6055dd