Revert TimeZoneDetector / TimeDetector changes
am: 9bc4829b4a

Change-Id: Ifbc4bd37e3465c81a7ef8527bf231caee3045aa9