[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 0afd92cb3a -s ours am: 3c36540323 -s ours

am skip reason: Change-Id I722aedc00409b8931c6d05efea4342279d32a7cf with SHA-1 0c7e97eb67 is in history

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

Change-Id: I20180e1e01e8ef1e27330d70b3c4fa55926f1437