[automerger skipped] [automerger] Clear the Parcel before writing an exception...

[automerger skipped] [automerger] Clear the Parcel before writing an exception during a transaction am: f8ef5bcf am: 86c9bdd2 am: 6d72c068 am: d944d907 am: 31737b46 am: 2ca66d4d am: 1c8a632a am: 7eec0a84 am: 57f6c0de -s ours
am: 152bcd66 -s ours
am skip reason: change_id Iaf80a0ad711762992b8ae60f76d861c97a403013 with SHA1 06041db0 is in history

Change-Id: Ifc7597c6303eee3d41f27e594e868ea7084e4255