Merge "Revert "Minimum viable TimeZoneDetectorService"" am: 1fe970651f
am: 91145c9a6e

Change-Id: Id3d2d5802a5a68058b4d70e49b02380c55c4a236