[automerger skipped] Update Android to tzdb 2020a [Q branch] am: f799e1ceff -s ours am: c077b8d121 -s ours

am skip reason: Change-Id I7102ef8296d3e11723c64e37f845f611e7ea47df with SHA-1 6e9f43df7f is in history

Change-Id: I8ac2c49d9bc204d353630c445b33c4423c208df4