Merge "Make CONNECTIVITY_USE_RESTRICTED_NETWORKS @SystemApi." am: a1e206a335
am: 37afaac70d

Change-Id: Id576f61f3ac7d1de828c870ffaf4d6ab3e1e2568