[automerger skipped] Merge Android R...

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: d39df757 -s ours am: 9b3e51b7 -s ours am: 9204c2b2 -s ours am: 5f3114cb -s ours am: badb4fa7 -s ours

am skip reason: Change-Id Ife760e8dd30ff7c3d3940ca3b061e9f5da2c2684 with SHA-1 877ebe32 is in history

Original change: https://googleplex-android-review.googlesource.com/c/kernel/prebuilts/4.19/arm64/+/12470020

Change-Id: I26a19c1802e22402384ce3a78e813b2798a5a121