Merge changes from topic "am-98c2fa31b1774177893a0478969b96cd" into pie-cts-dev

* changes:
  [automerger skipped] Merge "Track tzdb 2020a changes [O-MR1 CTS branch]" into oreo-mr1-cts-dev am: 9b27faeadb -s ours
  Merge "Fix TestFormatter test for 2020a update [O-MR1 CTS]" into oreo-mr1-cts-dev am: e59b47ef82