am 07232e8d: am bfcf92f1: am f3973456: Merge "Email app might use cleartext network traffic." into mnc-dev

* commit '07232e8d95c22412fb57f0cf8aed5eccb67e927a':
  Email app might use cleartext network traffic.