[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: a8a918f6e8 -s ours am: dcacbe249d -s ours

am skip reason: Change-Id Ibac646f3f171e29cc1cb8383070fdcd3cc2aeff7 with SHA-1 330f6dcf6e is in history

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

Change-Id: I2894346d073d90908dd0837419ae125a2701c228