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

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

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