am c69d6850: am 3cc0f58f: am 54cbbcd4: Merge "Phone app might use cleartext network traffic." into mnc-dev

* commit 'c69d68501b18b84bed115da2d836b0d17d31deaf':
  Phone app might use cleartext network traffic.