Merge "ParcelableHolder: assert stability on read" am: 180aa227f6 am: a9febdf125

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2020960

Change-Id: Ice98a4c2cd8e96dee7f7be8052e946ae41ba7ef7