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

Change-Id: I4a294fc077f665ac3b43f0b7421d7eb30c9a8bb9