Merge "Track tzdb 2020a changes [O CTS branch]" into oreo-cts-dev am: fb11ba94ec am: f2b6f433a5

Change-Id: I9f52f8e2c012529f87ed09abdb813a8cda841bf5