Merge "Fix hidden usage of networkCapabilitiesForType"
am: 73661b9a3d

Change-Id: I8d854f79b4da4ee57ce0d3f5c631a3641d56e435