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

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6d2addcb1a268b5d80c42936146655f1b469a2c6