[automerger skipped] Merge "Deleted "<action android:name="android.intent.action.SEND_MULTIPLE" />" in "com.android.email.activity.ComposeActivityEmailExternal" activity of the AndroidManifest.xml as part of cleanup." into pi-dev am: 01a89caf3b -s ours am: efdd22b61a -s ours
am: 488f5c6a94 -s ours
am skip reason: change_id Iff7a42a3248a8b45cf128d2335624fc298c8888c with SHA1 8e75186d72 is in history

Change-Id: Ie80b528e6a578d286586a2698ee51cdb7044e6fa