Merge "Use SystemApi framework parcelables directly" am: 021ea66aea
am: 4864ffd97e

Change-Id: I28b60bcaf76d8902f3cd9d7956931c98d8d85710