[automerger skipped] Merge "Track tzdb 2020a changes [P CTS]" into pie-cts-dev am: 44e797341b am: 373621018a am: 2920c96524 -s ours

am skip reason: Change-Id Icdbab139b91b5882b42d986b6b85bd9cef41dcf0 with SHA-1 330f6fd259 is in history

Change-Id: Idde9c5adaf61bbf884272aa430ec2906d7873580