Merge "Expose 'ParcelableHolder' as SystemApi" am: 135efb0b73 am: 5e1cacaa28

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

Change-Id: I7af96574a930efed7c5c7d45a0c5bfd40a569d22