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

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