Merge "Replace hidden ParcelFileDescriptor constructor usage"