[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 867e286057 -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: I9ef9f7f08755b25d41a967d543a13440ae8cc48f