[automerger skipped] Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709) am: 7e90494ad7 -s ours am: 267a309acd -s ours

am skip reason: Change-Id I4af385786d1f73bf0903d7ef76a5041c63176cfc with SHA-1 3d4353bf00 is in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/connectivity/wificond/+/12470287

Change-Id: I78649254b36d467b8639ec35aba92d35ee421fe8