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