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

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

Change-Id: I8c5c03a134339f2cc2ab4f6c648d1f1235e697c5