[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 867e286057 -s ours am: 66bd02c98b -s ours am: 58dd9ee8ce -s ours am: 7accb6b15b -s ours

am skip reason: Change-Id I207b48f559ebeef67028e7273ee46aa07accaf75 with SHA-1 c2e02fb6bf is in history

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

Change-Id: I1a82cee829739532c662acf19490ff798f4544fb