[automerger skipped] DO NOT MERGE - Merge Android 13 am: 2fb7baf7ff -s ours am: 5b716fffed -s ours am: 30d8460a24 -s ours am: f73c0d4235 -s ours

am skip reason: subject contains skip directive

Original change: https://android-review.googlesource.com/c/platform/packages/modules/GeoTZ/+/2186862

Change-Id: I59263293fb567b8cc9ceac32888ff6aa3722c06d
Signed-off-by: Automerger Merge Worker <[email protected]>