[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

Change-Id: I8dccbfc8337c888bbf7b4ba9079cc86d7b422b10