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

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

Change-Id: I2f38955b4aa61f1136f355dfa0a7b772dd345721