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

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



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