Merge "Remove progress property support from encrypt_inplace()" am: 8bf0d914df am: 65c5e339cb am: 764f097287

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

Change-Id: Ib9a6e5c472840a6721728c6c523eb087f018973b