Merge "Add more behavior to TimeDetectorService" am: b1fc5a4c7e am: 325ecf7df4
am: 55b29baea1

Change-Id: I4fe5fe32ffbd807680d688f4415e5dc9e47069d5