[automerger skipped] Merge "Track tzdb 2020a changes [N MR1 CTS branch]" into nougat-mr1-cts-dev am: 9a5b1ba7f7 -s ours skipped: 71fc6b75a3 skipped: 145f724ad4

Change-Id: I51cf4b1100859f353afe4b564dfe3e5978ec9db2