[automerger skipped] Merge "Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)" into stage-aosp-master am: 346a5290dc -s ours

am skip reason: Change-Id I81970e711d35b49e1bd8af000ce1a1ef60406efd with SHA-1 b653737a1b is in history

Original change: https://googleplex-android-review.googlesource.com/c/device/google/coral-sepolicy/+/12485002

Change-Id: Id406220b753ac71fbd692801f0e4237c82c8bc1a