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

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

Change-Id: I3c73357c29bc6f598bd15b36b3af59f12edaf38e