Merge "Remove the feature flag and dead code for the old time zone picker"
am: 6bb4b5ca43

Change-Id: If338977d818193950ed428b70ed6d6a3aa87082b