[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 0b69784061 -s ours

am skip reason: Change-Id I65974f17ab007170f37ddb5aa81a2f2c05bc2254 with SHA-1 095a1d11a8 is in history

Original change: https://googleplex-android-review.googlesource.com/c/device/ti/beagle-x15/+/12469996

Change-Id: I75acac6afb7e53feaf212438e73142d024be737f