am aac44855: am c19c6738: Merge "vold: acquire wakelock on fstrim thread"

* commit 'aac44855caf0f2f7f2e655fc06ce9782b9c80af7':
  vold: acquire wakelock on fstrim thread