[automerger skipped] Merge "Parcel: better debug recycle" am: 6db478c8 am:...

[automerger skipped] Merge "Parcel: better debug recycle" am: 6db478c8 am: f303e2db -s ours am: 796b4d67 -s ours am: 481162d3 -s ours

am skip reason: Merged-In I1dd9f392ee916edd9c598085a1c19dbdd3ce957f with SHA-1 00fe31de is already in history

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2100351



Change-Id: I4782c71d20398bf901d27657b9f591b1f21243ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>