Merge "Clean up potential busy files after key eviction." am: eee11498 am: 5c76dbd2

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



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