Merge "Remove wake lock checks from TimeDetectorStrategy"
am: dc20cafcc1

Change-Id: Ib5cb91dcec59ecf65e980afb6788692e9293bd9b