[automerger skipped] Merge sc-dev-plus-aosp-without-vendor@7634622 am: bb61f2740a -s ours

am skip reason: Merged-In I3df22a44ee75fa2f55e1329d749e92d7d2f8a0ef with SHA-1 f07921f3d4 is already in history

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

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