Merge "Add tests for NetCapability#getCapabilityCarrierName" am: 45fa6bd811

Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1683350

Change-Id: I90d74f4ec5f6b7bbe81862484f50fc7fb83ae134