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

Change-Id: I28d5b3dbd666dc9d097f6fb7c15dc5ba8cf931e9