[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: c43cbbcf62

Change-Id: I1ac044be29955950b6ab9afeaa3ea61c4b9e0f1c