Merge "vold: fix idlemaint abort may hold the wakelock" into main am: 1d0290c4 am: ba9097a2

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



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