[automerger] AOSP/Email - Create an empty Bundle if originalExtras doesn't exit. Backporting the fix to fix NullPointerException. am: 3150b66305

Change-Id: I7414816da3c0dca218de3e2c8fbd3427bb31af92