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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Idf8304204dad34a79c6ccdc47d9b8205cc202b03