Merge "Make StringNetworkSpecifier @SystemApi" am: fbceb58514 am: a4fbf15adf

Change-Id: I6b78f5cdbabcacbdb02ff82945c645efd6c74943