Merge "Extract TimeDetector/TimeZoneDetector interfaces" am: 17ac92f460 am: a9e81b53a9 am: f751b9ec06

Change-Id: Ic029c262cc34f8c0232cda3558a57f2fcaceb797