[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 81566f806f -s ours am: 23a6df9fa0 -s ours am: be3c079073 -s ours

am skip reason: Change-Id I6447f0dc7fc7cba37bacc75bcb21d75aa5033ef1 with SHA-1 86d719e44c is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/google/pixel-sepolicy/+/12470243

Change-Id: I0b674026cd182e12d08994d2ff3068d065ce9668