Merge "Document when usesCleartextTraffic is ignored." into nyc-dev