[automerger skipped] avoid extra release of unowned objects in Parcel error path am: d668098e47 am: d471beffd1 -s ours am: 57380b88ba -s ours

am skip reason: Merged-In I34411675687cb3d18bffa082984ebdf308e1c1a6 with SHA-1 7c8497e012 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/native/+/16177016

Change-Id: I8fd02cbeeae4a7e90fce6f3f718ad641bc4ce875