[automerger skipped] AOSP/Email - Create an empty Bundle if originalExtras doesn't exit. Backporting the fix to fix NullPointerException.
am: c504e21a11 -s ours
am skip reason: change_id Ica9eb7ad3ddd11c752a526c2b1d5f086c74da283 with SHA1 bb50c5de8f is in history

Change-Id: I65031a628faf9a3c51c5b9ef671392378c7d9764