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

Change-Id: I33ab2a6935edc25eb0cfcaee258ef6da92ed2c83