DO NOT MERGE. Revert "Enable the TimeZoneManagerService"
am: 96c619c826

Change-Id: Ib2d0ad551b0a8c4e3bf8529dd89fb8f563e5b651