[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 oc-dev am: 1a67c01d58 am: 918b68c223 -s ours
am: 6917e61a0b -s ours
am skip reason: change_id Iff7a42a3248a8b45cf128d2335624fc298c8888c with SHA1 2398f2f4d2 is in history

Change-Id: I3504082479b6a3080648b1e6417c30414f728cc4