[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: 063f6718e4

Change-Id: I069583d0780013426d5e028801bbf2ce70bb1ff4