Merge "ParcelableHolder shouldn't write anything for empty case" am: 97c2606bbd

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

Change-Id: I5f288f4e83a26b378bed41edc082ed501bb1f5a1