[automerger skipped] Merge Android 12 am: f2536834e7 -s ours

am skip reason: Merged-In I22d294c2396f98749438111ee03fcae2987f8aba with SHA-1 8286b25ee4 is already in history

Original change: https://android-review.googlesource.com/c/platform/system/timezone/+/1847922

Change-Id: Ifd84ac5a1288b3aadb87879ba3ee0420a65db705