[automerger skipped] Merge Android 12 am: 784ed5af96 -s ours am: c17083cd69 -s ours am: 8372582459 -s ours

am skip reason: Merged-In Id224adf06c7998893ed5f529c0a02baa012617ba with SHA-1 88d8196845 is already in history

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

Change-Id: I9c54b624db7a1f9629fa58f774839ce831be8979