Merge "AOSP/Email - Create an empty Bundle if originalExtras doesn't exit. Backporting the fix to fix NullPointerException."
am: ba4e097290

Change-Id: Ie47a1eeacf08121783ba81f06bb54519e305aa5b