[automerger skipped] Merge "Remove the feature flag and dead code for the old...
[automerger skipped] Merge "Remove the feature flag and dead code for the old time zone picker" am: 6bb4b5ca am: 78e13277
am: e4513236 -s ours
Change-Id: Ic69bcf413d1028ebfb3e8c6a2212bffe42232ae1