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

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

Change-Id: Ice91b35eda0f09cbb9d4a4e500a1e9984940b0f1