[automerger skipped] Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 506056232a -s ours am: 1648928122 -s ours am: f3f95ee641 -s ours

am skip reason: Change-Id Ib802163dd78dc2cb06eefb928110f19deea34122 with SHA-1 c010ed7f1d is in history

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

Change-Id: I10d6658a20b69236fdd85b2447390f5c12c675a4