aml_tz4_331314010 (9399028,com.google.android.tzdata4)
Merge cherrypicks of ['ag/20689306'] into sparse-9276767-L04300000957726832.

Change-Id: Id6cb3ce1c8fcadb79d1c32b733ae925dbf50bb04