[automerger skipped] Merge Android 14 QPR2 to AOSP main am: 0257550edb -s ours

am skip reason: Merged-In I4145ae54f9fc57d93dac0a8e9903c0e7982bede0 with SHA-1 6e5b9064a3 is already in history

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

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