[automerger skipped] Merge "Track tzdb 2020a changes [O CTS branch]" into oreo-cts-dev am: fb11ba94ec -s ours

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

Change-Id: I4ea1815590506de30ab35e170a5bbd6cbdbf14f0