Merge "cryptfs: kill processes more quickly in wait_and_unmount()" am: 297b23837e

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

Change-Id: I48bdc416c72646af7a6f87bad78e0b759e9f1080