[automerger skipped] [automerger] AOSP/Email - bug fix: do not allow composing message with hidden private data attachments. am: e81f6f92bb am: 2f17f9f018 am: 34534259de am: 33587b4e1d am: 30a7c1118c am: ef35412cb6 am: f7005dabcd am: 86e89cca74 am: 800736df79
am: 658dc5b8e9 -s ours
am skip reason: change_id I5f6541ceb79a1a1c598d0c8207e3cab98d1a8ac5 with SHA1 a3c35e0ed3 is in history

Change-Id: Iac69d87428cf4732de82eca271d57f04b618880d