am 22784885: Merge "Change update-tzdata.py to update ICU data as well"

* commit '227848854695fe5b6f7183fe507edf093808d8ff':
  Change update-tzdata.py to update ICU data as well