Merge "Remove the ability to turn off TimeDetectorService"
am: 71fd6f0113

Change-Id: I8b32782038657c504d30a2c4b1db1c4985546ed3