Merge "Use the application\'s usesCleartextTraffic flag" am: d16f5f121e
am: a1c0bea895

* commit 'a1c0bea89518d020b615740215bff7fc4356e991':
  Use the application's usesCleartextTraffic flag