[automerger skipped] Merge Android 12L am: 3e675b5a16 -s ours am skip reason: Merged-In I5e80107e6d535f774a45ab2fc4f792f70702ee21 with SHA-1 8a18f834a1 is already in history Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneUpdater/+/2013300 Change-Id: I542dd66da01ae4dfd178965f812d9453e7dc667d