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

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

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



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