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