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

Change-Id: I246e666a2246a51920e78c787b6ee31766b14766