Merge "Add shims for NetCapability#getCapabilityCarrierName"