Merge "Fix flakiness of testHasCarrierPrivilegesViaCarrierConfigs."