[automerger skipped] [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 am: e19a81b20c am: 7de20326e9 -s ours
am: e24a947615 -s ours
am skip reason: change_id Ica9eb7ad3ddd11c752a526c2b1d5f086c74da283 with SHA1 c504e21a11 is in history

Change-Id: I7a0a39e103dab89fa1097d673adf7dd7690e4792