Merge "Fix up NetworkSecurityConfigTests." into main