[automerger skipped] Merge "Remove the ability to turn off...
[automerger skipped] Merge "Remove the ability to turn off TimeDetectorService" am: 71fd6f01 am: 8f8f4da0 am: 4b8b022d
am: c66dbd75 -s ours
am skip reason: change_id Iad7ff59b19fa54750831819c68b7b733e5763902 with SHA1 bef7e809 is in history
Change-Id: I83435e93e0c0ffe663dfeae06665c508c80ac454