Merge "Fix uses-after-free" into main am: d405821a5f

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

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