Merge "Remove the feature flag for time zone picker"
am: 3183cbf6dc

Change-Id: I60e028709d06d26377a3d8d1db53822987620e7e