Merge "cryptfs: Update the size of dm-crypt device according to sector size"...

Merge "cryptfs: Update the size of dm-crypt device according to sector size" am: 03ad91c3 am: c33624f8 am: cfa19bbb

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



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