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

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

Change-Id: I56fa2f1b0a434c15e846319774028c435b905671