[automerger skipped] Merge Android 12L am: 3e675b5a16 -s ours am: c32f90c19f -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: Id818e1819cfd8f7cf4720e6dee52473ab4a5fb47
tree: 508a9ee8874ec4144c6afe2c85472f76b3ea4cc3
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. OWNERS