Merge "Remove wake lock checks from TimeDetectorStrategy" am: dc20cafcc1 am: 258588ecb9 am: dc39d0f25f

Change-Id: I5481acc660b14c86cbedbb819c16a858e1c26c23