Merge "Change cleartext traffic permitted default for P apps"