[automerger skipped] Merge "Revert "Minimum viable TimeZoneDetectorService"" am: 1fe970651f am: 91145c9a6e
am: e9c9b092f3 -s ours
am skip reason: change_id I39ed2fc7f8de8d4b2c0d883cd264cc126579af27 with SHA1 f4894d391b is in history

Change-Id: Ib37ce2c4ebba38ccb73f309650492420ae5f698a