[automerger] AOSP/Email - Second part of the Security Vulnerability fix -   Email App: Malicious app is able to compose message with hidden   attachments and bypass attachments path checks attaching private files   from /data/data/com.android.email/* am:  am: 247473a238 am: b6ef2df96b
am: ad38b06575

Change-Id: I3ffdfe709d8654341db989a31ed55e8110688826