Merge "[automerger skipped] [automerger] Clear the Parcel before writing an exception during a transaction am: f8ef5bcf21 am: 86c9bdd251 am: 6d72c0681f am: d944d907df am: 31737b4618 am: 2ca66d4d10 am: 1c8a632ad2 am: 7eec0a8448 am: 57f6c0deb2 -s ours am: 152bcd6687 -s ours am: 0278ae159c -s ours am skip reason: change_id Iaf80a0ad711762992b8ae60f76d861c97a403013 with SHA1 06041db074 is in history" into qt-r1-dev-plus-aosp