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

Change-Id: I50a5fbc005cf13f7b90027fecb066afcbba2d462