Deal pulls California plastic trash measure from ballot