Merge "ParcelableHolder uses its address for comparison" am: dad360f447 am: 32dca72b17

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I3c36d6f26c6a855a890329fc8c5229e5946b2d36