Merge "Clean up potential busy files after key eviction." am: eee1149800

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

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