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

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

Change-Id: I418d20ce436125e742f35e7848aeb2be31d26fbd