Merge "Make StringNetworkSpecifier @SystemApi"
am: fbceb58514

Change-Id: I3beee20d0e56223381b2e507752c71d2590b0264