[automerger skipped] Merge "Remove the feature flag and dead code for the old time zone picker" am: 6bb4b5ca43 am: 78e132773a
am: e451323669 -s ours
Change-Id: Ic69bcf413d1028ebfb3e8c6a2212bffe42232ae1
This commit is contained in: