aml_tz4_332714050 (11539598,com.google.android.go.tzdata4,com.google.android.tzdata4)
Merge cherrypicks of ['googleplex-android-review.googlesource.com/26226560'] into sparse-11351934-L03000030002032845.
SPARSE_CHANGE: I228d5991c685a35989f7c0fccb6647afb938520e

Change-Id: I90a5386f8075bea1fcb0e365a834309175c62bef