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

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