[automerger skipped] Merge "Remove the feature flag for time zone picker" am:...
[automerger skipped] Merge "Remove the feature flag for time zone picker" am: 3183cbf6 am: f3808b77 -s ours
am: bf3bf425 -s ours
am skip reason: change_id I4880f8e37d53879b971890a5d83ebdf1a417a262 with SHA1 56cb29c0 is in history
Change-Id: I5d0426e3d89a90e875dde61c29e18a89670b81c9