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

Change-Id: I0c98a75165e8b289a45044cb43ef22678c81a935