[automerger skipped] Merge "Remove the feature flag for time zone picker" am: 3183cbf6dc
am: f3808b772c -s ours
am skip reason: change_id I4880f8e37d53879b971890a5d83ebdf1a417a262 with SHA1 56cb29c0c3 is in history

Change-Id: I63be4df437fc043920b0e19531688923c4b5105e