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

Change-Id: Ie8890265b7dd1b5248ccef4dbb0f6fd58da55f85