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

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