[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: 111878349e

Change-Id: I1cf5ef715a43b93ff0bc243e26f2c1871b70f20b