Merge "Allow goldfish-setup to take wake locks"
am: 10f6bf093d

Change-Id: I0c6100a314ea619d91b1b4a2c82894b102cdaaea