[automerger skipped] Merge changes from topic "cherrypick-tzdb2022a2_sc-timezone-dev-b5n4zfxlfw" into tm-dev am: 9736168a6b -s ours

am skip reason: Merged-In I46902801b8a6388f7841309547d8d767ee9e95e9 with SHA-1 2c8afe22ce is already in history

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

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