[automerger] AOSP/Email - Create an empty Bundle if originalExtras doesn't exit. Backporting the fix to fix NullPointerException. am: 3150b66305 am: f384b385ea am: c2b3e391ba am: 6b22b904fb am: ae61fe4c0a am: 721f9c585c
am: 56b7e4558e

Change-Id: Ifaff3cf9dc4c441f8d20fad8e112e705ce2d81a1