Merge "Fix hidden usage of networkCapabilitiesForType" am: 73661b9a3d am: 2d4fe8afc8 am: dd605f0c0d

Change-Id: I1182b6969487cea599a52d5b77630c55ffdc3842