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

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