Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 CTS branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours" into oreo-cts-dev am: 6d7a838f06 -s ours am: 0181865f43 -s ours am: 887558033e -s ours

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

Original change: https://android-review.googlesource.com/c/platform/libcore/+/1318271

Change-Id: I3ccc1e437e06e97f57908b0ae9114fc9f42da742