Merge "Migrate unsafe parcel APIs in framework-minus-apex"