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

Change-Id: I76dfa6a85f276a23051fcaeb97978a08fd9d6b41