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

Change-Id: I03f109bd619777d30451c98342d5d51919a3af56