Merge "[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 CTS branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours skipped: 71fc6b75a3 skipped: 145f724ad4 skipped: f109dbf6d3 am: e70b1a0864 -s ours am: 84846dc7e4 -s ours" into oc-mr1-dev am: 94c8571798 -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: I122ad4b0b6b762445bef83c82b85b21c83c03088