q_tzdata_aml_295600118 (9891144,com.google.android.tzdata)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/22426031'] into sparse-9398985-L23400000959597435.
SPARSE_CHANGE: I5c2bdcd82490baa29492e77b116af8dc2904dad4

Change-Id: Ic01b3e9c67c8ffb80ac4ba863e7d60993d0ced52