[automerger skipped] Merge Android 12 am: 6b986116ec -s ours am: 502c795ce0 -s ours am: fa64b99d3e -s ours

am skip reason: Merged-In I41164ccc5c7eeb1bbc85b071bb79a3a39ddd6ec6 with SHA-1 bb61f2740a is already in history

Original change: https://android-review.googlesource.com/c/platform/packages/apps/TimeZoneUpdater/+/1847330

Change-Id: I3c3c4079307f25eccce7912d52abfc2bb206a2d0
tree: 16b13060335e22ac3e8fc103fcfb15aece0ab0aa
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. NOTICE
  6. OWNERS