Merge "Parcel: remove two undefined functions" am: 84544748e9 am: 57b18d5475

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7567a5c9cccd9337e8bd1eca727c5165e32050a6