Merge "cryptfs: Update the size of dm-crypt device according to sector size" am: 03ad91c3c2 am: c33624f8b2 am: cfa19bbb92 am: 56c8e62553 am: 17cf387bca

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

Change-Id: Iebce7f4f32045013ec75e122277bee66814f81cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>