Merge "[Bugfix] Fix compling error when enable LOG_REFS in Parcel.cpp" am: 35e7d618aa am: fe79a6a8b2

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

Change-Id: I638276ffefa84e75e6b714aa20c4fd67988d3442