[automerger skipped] Merge "Track tzdb 2020a changes [O-MR1 CTS branch]" into oreo-mr1-cts-dev am: 9b27faeadb am: 73360a7a38 -s ours am: 6810c14ab2 -s ours am: 8cc6ab118d -s ours

am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history

Change-Id: Idb21dee52f3d244e5f51d6e3b27549cb94307bdf