Merge "Unhide hostname aware isCleartextTrafficPermitted"