[automerger skipped] Merge "Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as merged" into stage-aosp-master am: d2266c9c77 -s ours am: e7f02e0a4f -s ours am: 32d5574001 -s ours

am skip reason: Change-Id Ia6e28f8962f749aae115cc04b4dc085065813960 with SHA-1 bbdcaffd33 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/apf/+/12469963

Change-Id: I723d76b90137445860b3e58d86acd071af75035a