[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709)...

[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 876d557f -s ours am: b840b448 -s ours

am skip reason: Change-Id I72aae48ac01c06c4417934962ce0f54e59713fbb with SHA-1 11a338ac is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/12469982

Change-Id: Id1a1ac6dc4d7c5a577f1e73b3a0c4ccff4bc4caf