Merge "Prevent poorly-extended ParcelableSpans from writing to parcels" into mnc-dev