aml_tz2_303900102 (9423707,com.google.android.tzdata2)
Merge cherrypicks of ['ag/20689308'] into sparse-9276965-L99100000957842711.

Change-Id: If8567b57596ed4e48a95ab6c2dc64a94fe9dfa95