[automerger skipped] Merge sc-v2-dev-plus-aosp-without-vendor@8084891 am: 8a18f834a1 -s ours am skip reason: Merged-In I6eb7795a2fabfafa9ad96ec9612b737fc5cfb13f with SHA-1 320dc495ee is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/TimeZoneUpdater/+/16845099 Change-Id: Iaa69678adbc3c13c8b330ada22a7d0fdb135f35e