Merge "[automerger skipped] Merge "Add test for NetworkSpecifier" into rvc-dev am: 326ac976 -s ours am: 3cb4dec4 -s ours" into rvc-d1-dev-plus-aosp