Merge "Properly unparcel the PFDs passed to android.content.ContentProviderProxy.openFile." into mnc-dev