[automerger skipped] Merge "DO NOT MERGE Track TZDB 2022a rev. 2 changes. [O-MR1 CTS]" into oreo-mr1-cts-dev am: c44612b872 -s ours am: fb7b265b8a -s ours am: 3ab951b642 -s ours am: 0fa08ed68b -s ours am: 4ad86ea4ed -s ours am: 2bfb332fe6 -s ours am: 0b4cf135e7 -s ours am: a9c2107fee -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/libcore/+/2194739

Change-Id: Idaf226657c935acaa9615e67ee8959bf010abf8b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>