[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

Change-Id: Idbfd7118d1cce7ee48e17f7d8cfe51aeb9ade265