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

Change-Id: I613fd5a4a3ec359707812e08e90eda213d4f7b0b