Merge "vold: acquire wakelock on fstrim thread"