aml_tz2_303900102 (9423707,com.google.android.tzdata2)
Merge "Merge Android10 QPR1 into AOSP master" am: 14627b1101 am: 391d25e4a2

Change-Id: I3eca611d50859056abd142c45fca62ab87f8459c