Merge 'goog/rvc-dev-plus-aosp' into mainline-prod

Test: m && m NetworkStack NetworkStackCoverageTests
Bug: 166414751
Change-Id: I28ee7cb66116d680c356f4eaf546f231a6b0bc25