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

Change-Id: I39134e3e45d3c6f2fac78a0180da7b83eb94b86f