[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 555a4df687 -s ours am: 4f0f474555 -s ours am: c576f7a90d -s ours

am skip reason: Change-Id Ia304ff142efc0a4550772f5cea25ef55b781542d with SHA-1 0d256aefb8 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/timezone/+/12470403

Change-Id: I75387c83d8fb52646a9c268e3e29b5c58c48c5d1