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

Change-Id: I0ba4d23db898a00b47e2232fa5a3e3f68c771224