Merge "[automerger skipped] Merge "Add test for NetworkSpecifier" into rvc-dev...

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 am: de02b2b6 -s ours

am skip reason: Change-Id Iade6a5b355b8812a5eb191345dfe393938ee272c with SHA-1 157d99fa is in history

Change-Id: Ic3bb19da7aa13e4f604bcad8ccbe1bf7c7d89652