[automerger skipped] Merge Android R...

[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 0b2dbb46 -s ours am: e6b2fcbe -s ours am: c1ad4e91 -s ours am: 725f7d5c -s ours am: a8b35ca7 -s ours

am skip reason: Change-Id I02faff3060bda901a2315693d8921c9280dc84bf with SHA-1 526dbaec is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/hardware/qcom/wlan/+/12470245

Change-Id: I8843f85d75a8ca6e243c04754938d4a2e22d7fa5