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

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



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