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

Change-Id: Ie5bc6073d0344d0560e98ec574f9bb3d3fecf182